Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of Rename fake_components to mock_components (#470) to humble #471

Open
wants to merge 1 commit into
base: humble
Choose a base branch
from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 14, 2022

This is an automatic backport of pull request #470 done by Mergify.
Cherry-pick of 215c771 has failed:

On branch mergify/bp/humble/pr-470
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 215c771.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   moveit2_tutorials.repos

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   doc/examples/dual_arms/dual_arm_panda_moveit_config/config/panda.ros2_control.xacro
	deleted by us:   doc/examples/dual_arms/dual_arm_panda_moveit_config/config/panda_hand.ros2_control.xacro

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added conflicts humble Humble branch labels Jul 14, 2022
(cherry picked from commit 215c771)

# Conflicts:
#	doc/examples/dual_arms/dual_arm_panda_moveit_config/config/panda.ros2_control.xacro
#	doc/examples/dual_arms/dual_arm_panda_moveit_config/config/panda_hand.ros2_control.xacro
@tylerjw
Copy link
Member

tylerjw commented Jul 14, 2022

The dual arm example should be backported first probably.

@vatanaksoytezer
Copy link
Contributor

Yeah, maybe merge this PR without dual arm stuff?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts humble Humble branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants